Merge branch 'deb/emacs23/d/sid/upstream' into deb/emacs23/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Thu, 30 Jul 2009 01:14:35 +0000 (20:14 -0500)
committerRob Browning <rlb@defaultvalue.org>
Thu, 30 Jul 2009 01:14:35 +0000 (20:14 -0500)
commit46bd32fa1545ed824ca0cc2207dc2af80b52c777
treea84041dbd183770e66e8564e81685cf8ed0494d5
parentf67d79a4a913cbf14a715f86367ade6514deed3a
parente13371d117f5f8480c069a2221889f3e65e0664e
Merge branch 'deb/emacs23/d/sid/upstream' into deb/emacs23/d/sid/master